Drop the get_client_pointer vfunc
authorMatthias Clasen <mclasen@redhat.com>
Sat, 25 Nov 2017 02:26:20 +0000 (21:26 -0500)
committerMatthias Clasen <mclasen@redhat.com>
Sat, 25 Nov 2017 16:04:15 +0000 (11:04 -0500)
There is no api using this anymore.

gdk/quartz/gdkdevicemanager-core-quartz.c
gdk/wayland/gdkdevice-wayland.c
gdk/win32/gdkdevicemanager-win32.c
gdk/x11/gdkdevicemanager-core-x11.c
gdk/x11/gdkdevicemanager-xi2.c

index 7620735de7c2bff05d0b2cc65a478742b25edc31..bded104d52811ba3777acf5d405e72bc08566064 100644 (file)
@@ -47,7 +47,6 @@ gdk_quartz_device_manager_core_class_init (GdkQuartzDeviceManagerCoreClass *klas
 
   object_class->finalize = gdk_quartz_device_manager_core_finalize;
   object_class->constructed = gdk_quartz_device_manager_core_constructed;
-  device_manager_class->get_client_pointer = gdk_quartz_device_manager_core_get_client_pointer;
 }
 
 static GdkDevice *
@@ -118,12 +117,3 @@ gdk_quartz_device_manager_core_constructed (GObject *object)
   gdk_display_add_seat (display, seat);
   g_object_unref (seat);
 }
-
-static GdkDevice *
-gdk_quartz_device_manager_core_get_client_pointer (GdkDeviceManager *device_manager)
-{
-  GdkQuartzDeviceManagerCore *quartz_device_manager_core;
-
-  quartz_device_manager_core = (GdkQuartzDeviceManagerCore *) device_manager;
-  return quartz_device_manager_core->core_pointer;
-}
index cd4e4a7d5b35c20339e08f9b010b37d27b0d8627..5ee91a3803e4ab198db6ca4e8d96135eacaa4465 100644 (file)
@@ -5001,30 +5001,12 @@ gdk_wayland_device_manager_finalize (GObject *object)
   G_OBJECT_CLASS (gdk_wayland_device_manager_parent_class)->finalize (object);
 }
 
-static GdkDevice *
-gdk_wayland_device_manager_get_client_pointer (GdkDeviceManager *device_manager)
-{
-  GdkWaylandDeviceManager *wayland_device_manager;
-  GdkWaylandSeat *seat;
-  GdkDevice *device;
-
-  wayland_device_manager = GDK_WAYLAND_DEVICE_MANAGER (device_manager);
-
-  /* Find the master pointer of the first GdkWaylandSeat we find */
-  device = wayland_device_manager->devices->data;
-  seat = GDK_WAYLAND_SEAT (gdk_device_get_seat (device));
-
-  return seat->master_pointer;
-}
-
 static void
 gdk_wayland_device_manager_class_init (GdkWaylandDeviceManagerClass *klass)
 {
-  GdkDeviceManagerClass *device_manager_class = GDK_DEVICE_MANAGER_CLASS (klass);
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
   object_class->finalize = gdk_wayland_device_manager_finalize;
-  device_manager_class->get_client_pointer = gdk_wayland_device_manager_get_client_pointer;
 }
 
 static void
index 9260f65553d14737a37c04e4806ca8aacb3af70f..1616d9a97a0bac9ed4ccfe59176596c16fb90e3d 100644 (file)
@@ -754,15 +754,6 @@ gdk_device_manager_win32_constructed (GObject *object)
                     NULL);
 }
 
-static GdkDevice *
-gdk_device_manager_win32_get_client_pointer (GdkDeviceManager *device_manager)
-{
-  GdkDeviceManagerWin32 *device_manager_win32;
-
-  device_manager_win32 = (GdkDeviceManagerWin32 *) device_manager;
-  return device_manager_win32->core_pointer;
-}
-
 static void
 gdk_device_manager_win32_class_init (GdkDeviceManagerWin32Class *klass)
 {
@@ -771,7 +762,6 @@ gdk_device_manager_win32_class_init (GdkDeviceManagerWin32Class *klass)
 
   object_class->finalize = gdk_device_manager_win32_finalize;
   object_class->constructed = gdk_device_manager_win32_constructed;
-  device_manager_class->get_client_pointer = gdk_device_manager_win32_get_client_pointer;
 }
 
 void
index 5a40dab41151fc0172f4e31ad3f680b14cce899f..fc26db264bab1a4fb69c67447673359dadf79291 100644 (file)
@@ -35,8 +35,6 @@
 static void    gdk_x11_device_manager_core_finalize    (GObject *object);
 static void    gdk_x11_device_manager_core_constructed (GObject *object);
 
-static GdkDevice * gdk_x11_device_manager_core_get_client_pointer (GdkDeviceManager *device_manager);
-
 static void     gdk_x11_device_manager_event_translator_init (GdkEventTranslatorIface *iface);
 
 static gboolean gdk_x11_device_manager_core_translate_event  (GdkEventTranslator *translator,
@@ -52,12 +50,10 @@ G_DEFINE_TYPE_WITH_CODE (GdkX11DeviceManagerCore, gdk_x11_device_manager_core, G
 static void
 gdk_x11_device_manager_core_class_init (GdkX11DeviceManagerCoreClass *klass)
 {
-  GdkDeviceManagerClass *device_manager_class = GDK_DEVICE_MANAGER_CLASS (klass);
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
   object_class->finalize = gdk_x11_device_manager_core_finalize;
   object_class->constructed = gdk_x11_device_manager_core_constructed;
-  device_manager_class->get_client_pointer = gdk_x11_device_manager_core_get_client_pointer;
 }
 
 static void
@@ -680,15 +676,6 @@ gdk_x11_device_manager_core_translate_event (GdkEventTranslator *translator,
   return return_val;
 }
 
-static GdkDevice *
-gdk_x11_device_manager_core_get_client_pointer (GdkDeviceManager *device_manager)
-{
-  GdkX11DeviceManagerCore *device_manager_core;
-
-  device_manager_core = (GdkX11DeviceManagerCore *) device_manager;
-  return device_manager_core->core_pointer;
-}
-
 void
 _gdk_x11_event_translate_keyboard_string (GdkEventKey *event)
 {
index 688780b8a65a8896a1e167579370caa5bbc3603c..2819059ca66fc3c1459b4ccc5dbe7c084e7504f4 100644 (file)
@@ -96,7 +96,6 @@ enum {
 static void
 gdk_x11_device_manager_xi2_class_init (GdkX11DeviceManagerXI2Class *klass)
 {
-  GdkDeviceManagerClass *device_manager_class = GDK_DEVICE_MANAGER_CLASS (klass);
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
   object_class->constructed = gdk_x11_device_manager_xi2_constructed;
@@ -104,8 +103,6 @@ gdk_x11_device_manager_xi2_class_init (GdkX11DeviceManagerXI2Class *klass)
   object_class->set_property = gdk_x11_device_manager_xi2_set_property;
   object_class->get_property = gdk_x11_device_manager_xi2_get_property;
 
-  device_manager_class->get_client_pointer = gdk_x11_device_manager_xi2_get_client_pointer;
-
   g_object_class_install_property (object_class,
                                    PROP_OPCODE,
                                    g_param_spec_int ("opcode",